b9d2a2b1689381da61dc595a243ea4ecb91e40e3,plugins/git4idea/src/git4idea/merge/GitConflictResolver.java,GitConflictResolver,unmergedFiles,#VirtualFile#,286
Before Change
return Collections.emptyList();
}
else {
ArrayList<VirtualFile> rc = new ArrayList<VirtualFile>(unmerged.size());
rc.addAll(unmerged);
Collections.sort(rc, GitUtil.VIRTUAL_FILE_COMPARATOR);
return rc;
}
}
After Change
return new File(root.getPath(), path);
}
});
return ContainerUtil.sorted(RefreshVFsSynchronously.refreshFiles(files), GitUtil.VIRTUAL_FILE_COMPARATOR);
}
}